3c089d8722494fe67be6809f11c7f7dd38173233,passport/src/main/java/com/continuuity/passport/http/handlers/ActivationNonceHandler.java,ActivationNonceHandler,getRegenerateResetKey,#String#,111

Before Change


      nonce = securityService.getResetNonce(emailId);
      if (nonce != -1) {
        requestSuccess();
        return Response.ok(Utils.getNonceJson(null, nonce)).build();
      } else {
        requestFailed();
        LOG.error(String.format("Could not get reset key. Endpoint %s",
          "GET /passport/v1/generateResetKey/{emailId}"));
        return Response.status(javax.ws.rs.core.Response.Status.NOT_FOUND)
          .entity(Utils.getNonceJson("Couldn't generate resetKey", nonce))
          .build();
      }
    } catch (RuntimeException e) {
      requestFailed();
      LOG.error(String.format("Could not get reset key. Endpoint %s %s",
        "GET /passport/v1/generateResetKey/{emailId}", e.getMessage()));
      return Response.status(javax.ws.rs.core.Response.Status.NOT_FOUND)
        .entity(Utils.getJsonError(String.format("Couldn't generate resetKey for %s", emailId)))
        .build();
    }
  }

After Change


      nonce = securityService.getResetNonce(emailId);
      if (nonce != -1) {
        requestSuccess();
        responder.sendString(HttpResponseStatus.OK, Utils.getNonceJson(null, nonce));
      } else {
        requestFailed();
        LOG.error(String.format("Could not get reset key. Endpoint %s",
          "GET /passport/v1/generateResetKey/{emailId}"));
        responder.sendString(HttpResponseStatus.NOT_FOUND,
                             Utils.getNonceJson("Couldn't generate resetKey", nonce));
      }
    } catch (RuntimeException e) {
      requestFailed();
      LOG.error(String.format("Could not get reset key. Endpoint %s %s",
        "GET /passport/v1/generateResetKey/{emailId}", e.getMessage()));
      responder.sendString(HttpResponseStatus.INTERNAL_SERVER_ERROR,
                           Utils.getJsonError(String.format("Couldn't generate resetKey for %s", emailId)));
    }
  }